-
-
Notifications
You must be signed in to change notification settings - Fork 540
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Needs TM] Repaths and sorts outfits into factional files, Factional SecHud Icons #2628
Merged
+3,017
−2,479
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
keywordlabeler
bot
added
the
Do Not Merge
You probably made someone angry, or you're stopping people from getting angry.
label
Jan 5, 2024
github-actions
bot
added
Map Change
Tile placing is hard. Thank you for your service.
DME Edit
Code change
Watch something violently break.
labels
Jan 5, 2024
meemofcourse
changed the title
[DNM] Repaths and sorts outfits into factional files
[DNM] Repaths and sorts outfits into factional files, Factional SecHud Icons
Jan 5, 2024
meemofcourse
changed the title
[DNM] Repaths and sorts outfits into factional files, Factional SecHud Icons
[Needs TM] Repaths and sorts outfits into factional files, Factional SecHud Icons
Jan 6, 2024
atomization? no, not quite
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: meem <[email protected]>
…test into outfit-sorting
this is definitely good code
shiptest-server
pushed a commit
that referenced
this pull request
Jan 17, 2024
Merged
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Jan 27, 2024
…SecHud Icons (shiptest-ss13#2628) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> This pull request does the following: * Revives shiptest-ss13#2455 and shiptest-ss13#2493 * Sorts every factional outfit into a base outfit. These base outfits apply a faction. * Puts factional outfits into their own files. * Adds (partial) factional backgrounds for sechud icons. ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/07f7b83b-14bb-4cbf-a250-4dd16208da02) ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/b32620e5-d0fe-4b59-b013-d30211f2f2aa) * Adds a new Frontiersmen ERT. The gimmick is that their equipment is randomized, for the true "when the first is killed, the second takes the rifle" experience. You could get a mounted machine gun. Or a flyswatter. ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/f5f058f1-4bdf-4abd-8bef-ff6158bdfb41) * Makes Agent Cards work with SecHuds, and get overlays when using the Select Chameleon Outfit button. * Fixes the chameleon mask and goggles default icon states. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Easier to sift through. IFF (2234). Support for custom SecHud icons. Actually looks pretty on the outfit manager. Sugarcube Frontiersmen Rogue-like 2024. Identity Threat+. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> :cl: MeeMOfCourse, retlaw34 tweak: Repathed almost every faction outfit, and they now apply factions upon being used. tweak: SecHud icons have been redone. Sprites by retlaw34. tweak: Descriptions of multiple clothing items. add: SecHuds now identify factions. Somewhat. add: More desperate groups of Frontiersmen have been spotted roaming the frontier. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: meem <[email protected]>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 2, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Continuation of #2628, which was merged without a testmerge. This fixes some ERT outfits, adds a Syndicate Inspector ERT (which had the outfit defined but not the ERT), and fixes the independent sechud background. Also messes with the CMM Inspector's icon. ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/a3ac82d6-e5c2-4028-9992-f2565604ac0b) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game blame zephyr <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: ACLF Syndicate Inspector ERT fix: Independent background icons fix: ERT Outfits not having access and proper names /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Feb 2, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> Continuation of shiptest-ss13#2628, which was merged without a testmerge. This fixes some ERT outfits, adds a Syndicate Inspector ERT (which had the outfit defined but not the ERT), and fixes the independent sechud background. Also messes with the CMM Inspector's icon. ![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/a3ac82d6-e5c2-4028-9992-f2565604ac0b) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> blame zephyr <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> :cl: add: ACLF Syndicate Inspector ERT fix: Independent background icons fix: ERT Outfits not having access and proper names /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Code change
Watch something violently break.
DME Edit
Do Not Merge
You probably made someone angry, or you're stopping people from getting angry.
Map Change
Tile placing is hard. Thank you for your service.
Sprites
A bikeshed full of soulless bikes.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
This pull request does the following:
Why It's Good For The Game
Easier to sift through. IFF (2234). Support for custom SecHud icons. Actually looks pretty on the outfit manager. Sugarcube Frontiersmen Rogue-like 2024. Identity Threat+.
Changelog
🆑 MeeMOfCourse, retlaw34
tweak: Repathed almost every faction outfit, and they now apply factions upon being used.
tweak: SecHud icons have been redone. Sprites by retlaw34.
tweak: Descriptions of multiple clothing items.
add: SecHuds now identify factions. Somewhat.
add: More desperate groups of Frontiersmen have been spotted roaming the frontier.
/:cl: